]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
extension-tool: Set reminder for removing old compat code
authorFlorian Müllner <fmuellner@gnome.org>
Sun, 12 Feb 2023 23:26:29 +0000 (00:26 +0100)
committerMarge Bot <marge-bot@gnome.org>
Sun, 19 Mar 2023 19:26:55 +0000 (19:26 +0000)
GSettings schemas are now compiled at install time, so it is no
longer necessary to include the compiled schema in the archive.

However the `gnome-extensions pack` command hasn't been adjusted,
so that it can still be used to produce valid archives for all
supported versions.

To not let that code linger forever, error out when building
a version where GNOME 44 is the oldest supported release.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2639>

subprojects/extensions-tool/src/command-pack.c
subprojects/extensions-tool/src/meson.build

index c8d99500655c82e09c179eb84546733a39bb6e06..f2cfcd51ab58e85967cb0b48ae2e41c0b4d0b968 100644 (file)
@@ -163,12 +163,16 @@ extension_pack_add_schemas (ExtensionPack  *pack,
         return FALSE;
     }
 
+#if MAJOR_VERSION >= 46
+#error "Outdated compatibility code, please remove"
+#else
   dstpath = g_file_get_path (dstdir);
   proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error,
                            "glib-compile-schemas", "--strict", dstpath, NULL);
 
   if (!g_subprocess_wait_check (proc, NULL, error))
     return FALSE;
+#endif
 
   g_hash_table_insert (pack->files,
                        g_strdup ("schemas"), g_steal_pointer (&dstdir));
index a855fef973498fa91e0e5f7458dc97e814ac3d7f..f7bda8aff927f4d42dcc546fbf439416d8cff2b5 100644 (file)
@@ -1,6 +1,7 @@
 config_h = configuration_data()
 config_h.set_quoted('GETTEXT_PACKAGE', package_name)
 config_h.set_quoted('VERSION', meson.project_version())
+config_h.set('MAJOR_VERSION', meson.project_version().split('.')[0])
 config_h.set_quoted('LOCALEDIR', localedir)
 config_h.set('HAVE_BIND_TEXTDOMAIN_CODESET', cc.has_function('bind_textdomain_codeset'))
 configure_file(